Merge commit vkjson-instance into nyc-dev Bug: 26620936 Change-Id: Id4f5a693cf23384612391e63b0529e31053ceca6